* alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always.

diff --git a/src/ChangeLog b/src/ChangeLog
index e7016c6165bb59d3253391b13cdd02f77b34233c..159bf04075ed192897f9842f36a09e851c736730 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * alloc.c (Fmemory_limit): Avoid compiler warning.  Return 0 always.
+
 2013-12-08  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating.

diff --git a/src/alloc.c b/src/alloc.c
index f076075a94f5da486c0dd956ff07d974b6bc8d8a..aeda42637cde8ee5688d55fbe7c0da89191d21d6 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6633,7 +6633,12 @@ We divide the value by 1024 to make sure it fits in a Lisp integer.  */)
 {
   Lisp_Object end;
 
+#ifdef HAVE_NS
+  /* Avoid warning.  sbrk has no relation to memory allocated anyway.  */
+  XSETINT (end, 0);
+#else
   XSETINT (end, (intptr_t) (char *) sbrk (0) / 1024);
+#endif
 
   return end;
 }